Update ia64 to keep up with core changes

diff --git a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
index d79b8684480cbe6cf44a9f855a905973c42169a9..2c81709555653b6644fa870a1f9dff5d90af7e9d 100755 (executable)
--- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
+++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
@@ -17,7 +17,7 @@ then
        mv arch/xen arch/xen.xen-x86
        mkdir arch/xen
        mv arch/xen.xen-x86/configs arch/xen
-       mv include/asm-generic include/asm-generic.xen-x86
+#      mv include/asm-generic include/asm-generic.xen-x86
        mv include/linux include/linux.xen-x86
        mkdir include/linux
 fi

diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c
index 9f64f0ce4e34b09f22aab25a39bba4e355aeb1cc..b5942442e887b71945075f59b28839e18556ba43 100644 (file)
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c
@@ -35,12 +35,18 @@ int bind_virq_to_irq(int virq)
        while(1);
 }
 
+void notify_remote_via_irq(int virq)
+{
+       printk("notify_remote_via_irq called... FIXME??\n");
+       while(1);
+}
+
 void unbind_virq_from_evtchn(int virq)
 {
     evtchn_op_t op;
 
     op.cmd = EVTCHNOP_close;
-    op.u.close.dom = DOMID_SELF;
+//    op.u.close.dom = DOMID_SELF;
     op.u.close.port = virq_to_evtchn[virq];
     if ( HYPERVISOR_event_channel_op(&op) != 0 )
        BUG();

diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h
index ac2ae71c540ac57c6643cf1f4288eb95d7a93d9e..6890c67d7d3596d277166646ae3a6aa7eebea50d 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h
@@ -48,6 +48,7 @@ void force_evtchn_callback(void);
 // for drivers/xen/privcmd/privcmd.c
 #define direct_remap_pfn_range(a,b,c,d,e,f) remap_pfn_range(a,b,c,d,e)
 #define        pfn_to_mfn(x)   (x)
+#define        mfn_to_pfn(x)   (x)
 #define machine_to_phys_mapping 0
 
 #endif /* __HYPERVISOR_H__ */

diff --git a/xen/arch/ia64/xen/hypercall.c b/xen/arch/ia64/xen/hypercall.c
index c8abf6d11549c6fc22bba769c2f196a442be68d2..111219e97b6ecac10ac4228349d820f2cdb57e56 100644 (file)
--- a/xen/arch/ia64/xen/hypercall.c
+++ b/xen/arch/ia64/xen/hypercall.c
@@ -15,6 +15,7 @@
 #include <asm/vcpu.h>
 #include <asm/dom_fw.h>
 #include <public/memory.h>
+#include <public/sched.h>
 
 extern unsigned long translate_domain_mpaddr(unsigned long);
 extern struct ia64_pal_retval xen_pal_emulator(UINT64,UINT64,UINT64,UINT64);

diff --git a/xen/arch/ia64/xen/xenmisc.c b/xen/arch/ia64/xen/xenmisc.c
index 49a44e000176b84373be01a9d88c33fa67e2d496..e25a8fa1f0d7bd3e967de31b68f780e28953a7b0 100644 (file)
--- a/xen/arch/ia64/xen/xenmisc.c
+++ b/xen/arch/ia64/xen/xenmisc.c
@@ -16,6 +16,7 @@
 #include <xen/serial.h>
 #include <asm/io.h>
 #include <xen/softirq.h>
+#include <public/sched.h>
 
 efi_memory_desc_t ia64_efi_io_md;
 EXPORT_SYMBOL(ia64_efi_io_md);